fnf rewrite v2